-
Bienvenue sur l'application
+ Welcome to the app
+
La cinquante trois
- L'application qui va faciliter la coordination de ton contest
+ The application that will make your contest easier
![La53 logo]()
@@ -27,7 +27,7 @@
[class.fadeInLeft]="elementInViewport(contacts)" #contacts id="contacts-animation">
Mail:
lacinquantetrois@gmail.com
-
Github:
+
Github:
Version:{{ version }}
diff --git a/src/app/public/home/home.component.ts b/src/app/public/home/home.component.ts
index 3745cf8..ea8f55a 100644
--- a/src/app/public/home/home.component.ts
+++ b/src/app/public/home/home.component.ts
@@ -2,8 +2,8 @@
import {
Component, OnInit, ElementRef, ViewChild,
} from '@angular/core';
-import { environment } from 'src/environments/environment';
import { Title } from '@angular/platform-browser';
+import { environment } from '../../../environments/environment';
import { AnimationService } from '../services/animation.service';
@Component({
diff --git a/src/app/public/news/news.component.html b/src/app/public/news/news.component.html
index e45cded..c1f38d4 100644
--- a/src/app/public/news/news.component.html
+++ b/src/app/public/news/news.component.html
@@ -20,7 +20,7 @@
LA CINQUANTE TROIS
La 53 a été créée dans le but de faciliter l'organisation et la coordination des contests, depuis la création des catégories et des poules jusqu'à l'annonce des résultats.
-
+
diff --git a/src/app/public/public.module.ts b/src/app/public/public.module.ts
index a4bec8a..c4a8fc3 100644
--- a/src/app/public/public.module.ts
+++ b/src/app/public/public.module.ts
@@ -1,16 +1,15 @@
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { HomeComponent } from './home/home.component';
import { TopMenuComponent } from './top-menu/top-menu.component';
import { CarouselComponent } from './carousel/carousel.component';
import { NewsComponent } from './news/news.component';
import { DescriptionOverviewComponent } from './description-overview/description-overview.component';
import { DescriptionOverviewResolve } from './description-overview/description-overview.resolve';
-import { FirebaseModule } from '../shared/firebase.module';
import { AnimationService } from './services/animation.service';
+import { MinimalMaterialModule } from '../shared/minimal-material.module';
+import { LanguagesModule } from '../language/languages.module';
const routes: Routes = [
{
@@ -34,10 +33,9 @@ const routes: Routes = [
@NgModule({
imports: [
CommonModule,
- MatIconModule,
- MatProgressSpinnerModule,
+ MinimalMaterialModule,
+ LanguagesModule,
RouterModule.forChild(routes),
- FirebaseModule,
],
declarations: [
HomeComponent,
diff --git a/src/app/public/top-menu/top-menu.component.html b/src/app/public/top-menu/top-menu.component.html
index fecf98f..8a7d1b4 100644
--- a/src/app/public/top-menu/top-menu.component.html
+++ b/src/app/public/top-menu/top-menu.component.html
@@ -11,4 +11,6 @@
personSe connecter
+
+
diff --git a/src/app/shared/minimal-material.module.ts b/src/app/shared/minimal-material.module.ts
new file mode 100644
index 0000000..478a0e5
--- /dev/null
+++ b/src/app/shared/minimal-material.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
+import { MatMenuModule } from '@angular/material/menu';
+
+const materialModules = [
+ MatIconModule,
+ MatFormFieldModule,
+ MatProgressSpinnerModule,
+ FormsModule,
+ MatInputModule,
+ ReactiveFormsModule,
+ MatMenuModule,
+];
+
+@NgModule({
+ imports: [
+ ...materialModules,
+ ],
+ exports: [
+ ...materialModules,
+ ],
+})
+export class MinimalMaterialModule { }
diff --git a/src/app/shared/models/languages.ts b/src/app/shared/models/languages.ts
new file mode 100644
index 0000000..ea25932
--- /dev/null
+++ b/src/app/shared/models/languages.ts
@@ -0,0 +1,5 @@
+export enum LANGUAGES_53 {
+ 'fr' = 'Français',
+ 'en' = 'English',
+ 'es' = 'Español',
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index c357aa7..88f16b9 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,5 +1,4 @@
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { CommonModule } from '@angular/common';
import { A11yModule } from '@angular/cdk/a11y';
@@ -7,60 +6,57 @@ import { A11yModule } from '@angular/cdk/a11y';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatInputModule } from '@angular/material/input';
import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
import { MatNativeDateModule } from '@angular/material/core';
-import { MatSelectModule } from '@angular/material/select';
import { MatTableModule } from '@angular/material/table';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSortModule } from '@angular/material/sort';
import { MatDialogModule } from '@angular/material/dialog';
import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatSelectModule } from '@angular/material/select';
+import { MinimalMaterialModule } from './minimal-material.module';
// Custom services
import { WarningComponent } from './warning/warning.component';
import { WarningService } from './warning/warning.service';
import { SnackBarService } from './services/snack-bar.service';
import { ComponentUtils } from './services/component-utils';
+// Other modules
+import { LanguagesModule } from '../language/languages.module';
import { FirebaseModule } from './firebase.module';
const materialModules = [
MatInputModule,
MatButtonModule,
- MatIconModule,
- MatSelectModule,
- MatProgressSpinnerModule,
MatTableModule,
MatSortModule,
MatDialogModule,
MatSnackBarModule,
MatDatepickerModule,
MatNativeDateModule,
+ MatSelectModule,
];
@NgModule({
imports: [
...materialModules,
CommonModule,
- FormsModule,
HttpClientModule,
FirebaseModule,
- ReactiveFormsModule,
+ MinimalMaterialModule,
+ LanguagesModule,
A11yModule,
],
declarations: [
WarningComponent,
],
exports: [
- FormsModule,
WarningComponent,
- ReactiveFormsModule,
A11yModule,
+ MinimalMaterialModule,
...materialModules,
],
providers: [
WarningService,
SnackBarService,
ComponentUtils,
- MatDatepickerModule,
],
schemas: [
CUSTOM_ELEMENTS_SCHEMA,
diff --git a/src/app/state.ts b/src/app/state.ts
index 00cdb6a..673013e 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -6,6 +6,7 @@ export interface State {
selectedContest: Contest;
judges: User[];
speaker: User;
+ language: String;
contests: {
[id: string]: Contest;
};
diff --git a/src/app/store.ts b/src/app/store.ts
index 21800e5..2cf7d34 100644
--- a/src/app/store.ts
+++ b/src/app/store.ts
@@ -8,6 +8,7 @@ const state: State = {
contests: {},
judges: undefined,
speaker: undefined,
+ language: undefined,
};
export class Store {
diff --git a/src/main.server.ts b/src/main.server.ts
new file mode 100644
index 0000000..68eeb54
--- /dev/null
+++ b/src/main.server.ts
@@ -0,0 +1,9 @@
+import { enableProdMode } from '@angular/core';
+
+import { environment } from './environments/environment';
+
+if (environment.production) {
+ enableProdMode();
+}
+
+export { AppServerModule } from './app/app.server.module';
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 6ba02cf..d120dbf 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -1,14 +1,14 @@
{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/app",
- "types": ["node"]
- },
- "files": [
- "main.ts",
- "polyfills.ts"
- ],
- "include": [
- "src/**/*.d.ts"
- ]
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/app",
+ "types": ["node"]
+ },
+ "files": [
+ "main.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "src/**/*.d.ts"
+ ]
}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index de77336..aff9ae9 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -1,18 +1,18 @@
{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/spec",
- "types": [
- "jasmine",
- "node"
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
]
- },
- "files": [
- "test.ts",
- "polyfills.ts"
- ],
- "include": [
- "**/*.spec.ts",
- "**/*.d.ts"
- ]
}
diff --git a/tsconfig.server.json b/tsconfig.server.json
new file mode 100644
index 0000000..53c2ed8
--- /dev/null
+++ b/tsconfig.server.json
@@ -0,0 +1,21 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./out-tsc/app-server",
+ "baseUrl": ".",
+ "types": ["node"],
+ "paths": {
+ "store": ["./src/app/store.ts"],
+ }
+ },
+ "include": [
+ "src/**/*.ts"
+ ],
+ "exclude": [
+ "test.ts",
+ "**/*.spec.ts"
+ ],
+ "angularCompilerOptions": {
+ "entryModule": "app/app.server.module#AppServerModule"
+ }
+}
diff --git a/tslint.json b/tslint.json
index ea31655..bfabc9e 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,131 +1,131 @@
{
- "rulesDirectory": [
- "node_modules/codelyzer"
- ],
- "rules": {
- "arrow-return-shorthand": true,
- "callable-types": true,
- "class-name": true,
- "comment-format": [
- true,
- "check-space"
+ "rulesDirectory": [
+ "node_modules/codelyzer"
],
- "curly": true,
- "deprecation": {
- "severity": "warn"
- },
- "eofline": true,
- "forin": true,
- "import-blacklist": [
- true,
- "rxjs/Rx"
- ],
- "import-spacing": true,
- "indent": [
- true,
- "spaces"
- ],
- "interface-over-type-literal": true,
- "label-position": true,
- "max-line-length": [
- true,
- 140
- ],
- "member-access": false,
- "member-ordering": [
- true,
- {
- "order": [
- "static-field",
- "instance-field",
- "static-method",
- "instance-method"
- ]
- }
- ],
- "no-arg": true,
- "no-bitwise": true,
- "no-console": [
- true,
- "debug",
- "info",
- "time",
- "timeEnd",
- "trace"
- ],
- "no-construct": true,
- "no-debugger": true,
- "no-duplicate-super": true,
- "no-empty": false,
- "no-empty-interface": true,
- "no-eval": true,
- "no-inferrable-types": [
- true,
- "ignore-params"
- ],
- "no-misused-new": true,
- "no-non-null-assertion": true,
- "no-redundant-jsdoc": true,
- "no-shadowed-variable": true,
- "no-string-literal": false,
- "no-string-throw": true,
- "no-switch-case-fall-through": true,
- "no-trailing-whitespace": true,
- "no-unnecessary-initializer": true,
- "no-unused-expression": true,
- "no-use-before-declare": true,
- "no-var-keyword": true,
- "object-literal-sort-keys": false,
- "one-line": [
- true,
- "check-open-brace",
- "check-catch",
- "check-else",
- "check-whitespace"
- ],
- "prefer-const": true,
- "quotemark": [
- true,
- "single"
- ],
- "radix": true,
- "semicolon": [
- true,
- "always"
- ],
- "triple-equals": [
- true,
- "allow-null-check"
- ],
- "typedef-whitespace": [
- true,
- {
- "call-signature": "nospace",
- "index-signature": "nospace",
- "parameter": "nospace",
- "property-declaration": "nospace",
- "variable-declaration": "nospace"
- }
- ],
- "unified-signatures": true,
- "variable-name": false,
- "whitespace": [
- true,
- "check-branch",
- "check-decl",
- "check-operator",
- "check-separator",
- "check-type"
- ],
- "no-output-on-prefix": true,
- "no-inputs-metadata-property": true,
- "no-outputs-metadata-property": true,
- "no-host-metadata-property": true,
- "no-input-rename": true,
- "no-output-rename": true,
- "use-lifecycle-interface": true,
- "use-pipe-transform-interface": true,
- "component-class-suffix": true,
- "directive-class-suffix": true
- }
+ "rules": {
+ "arrow-return-shorthand": true,
+ "callable-types": true,
+ "class-name": true,
+ "comment-format": [
+ true,
+ "check-space"
+ ],
+ "curly": true,
+ "deprecation": {
+ "severity": "warn"
+ },
+ "eofline": true,
+ "forin": true,
+ "import-blacklist": [
+ true,
+ "rxjs/Rx"
+ ],
+ "import-spacing": true,
+ "indent": [
+ true,
+ "spaces"
+ ],
+ "interface-over-type-literal": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 140
+ ],
+ "member-access": false,
+ "member-ordering": [
+ true,
+ {
+ "order": [
+ "static-field",
+ "instance-field",
+ "static-method",
+ "instance-method"
+ ]
+ }
+ ],
+ "no-arg": true,
+ "no-bitwise": true,
+ "no-console": [
+ true,
+ "debug",
+ "info",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-debugger": true,
+ "no-duplicate-super": true,
+ "no-empty": false,
+ "no-empty-interface": true,
+ "no-eval": true,
+ "no-inferrable-types": [
+ true,
+ "ignore-params"
+ ],
+ "no-misused-new": true,
+ "no-non-null-assertion": true,
+ "no-redundant-jsdoc": true,
+ "no-shadowed-variable": true,
+ "no-string-literal": false,
+ "no-string-throw": true,
+ "no-switch-case-fall-through": true,
+ "no-trailing-whitespace": true,
+ "no-unnecessary-initializer": true,
+ "no-unused-expression": true,
+ "no-use-before-declare": true,
+ "no-var-keyword": true,
+ "object-literal-sort-keys": false,
+ "one-line": [
+ true,
+ "check-open-brace",
+ "check-catch",
+ "check-else",
+ "check-whitespace"
+ ],
+ "prefer-const": true,
+ "quotemark": [
+ true,
+ "single"
+ ],
+ "radix": true,
+ "semicolon": [
+ true,
+ "always"
+ ],
+ "triple-equals": [
+ true,
+ "allow-null-check"
+ ],
+ "typedef-whitespace": [
+ true,
+ {
+ "call-signature": "nospace",
+ "index-signature": "nospace",
+ "parameter": "nospace",
+ "property-declaration": "nospace",
+ "variable-declaration": "nospace"
+ }
+ ],
+ "unified-signatures": true,
+ "variable-name": false,
+ "whitespace": [
+ true,
+ "check-branch",
+ "check-decl",
+ "check-operator",
+ "check-separator",
+ "check-type"
+ ],
+ "no-output-on-prefix": true,
+ "no-inputs-metadata-property": true,
+ "no-outputs-metadata-property": true,
+ "no-host-metadata-property": true,
+ "no-input-rename": true,
+ "no-output-rename": true,
+ "use-lifecycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true
+ }
}
diff --git a/webpack.server.config.js b/webpack.server.config.js
new file mode 100644
index 0000000..555f9fa
--- /dev/null
+++ b/webpack.server.config.js
@@ -0,0 +1,32 @@
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+ entry: { server: './server.ts' },
+ resolve: { extensions: ['.js', '.ts'] },
+ target: 'node',
+ mode: 'none',
+ // this makes sure we include node_modules and other 3rd party libraries
+ externals: [/node_modules/],
+ output: {
+ path: path.join(__dirname, 'dist'),
+ filename: '[name].js',
+ },
+ module: {
+ rules: [{ test: /\.ts$/, loader: 'ts-loader' }],
+ },
+ plugins: [
+ // Temporary Fix for issue: https://github.com/angular/angular/issues/11580
+ // for 'WARNING Critical dependency: the request of a dependency is an expression'
+ new webpack.ContextReplacementPlugin(
+ /(.+)?angular(\\|\/)core(.+)?/,
+ path.join(__dirname, 'src'), // location of your src
+ {}, // a map of your routes
+ ),
+ new webpack.ContextReplacementPlugin(
+ /(.+)?express(\\|\/)(.+)?/,
+ path.join(__dirname, 'src'),
+ {},
+ ),
+ ],
+};
- 
- 
- 
+ 
+ 
+ 
+ 