Anupriya commited on
Commit
3f95782
·
1 Parent(s): d024db0

disabled the submenu

Browse files
src/app/footer/footer.component.css CHANGED
@@ -179,6 +179,24 @@ footer .social-icons {
179
  box-shadow: 0 6px 22px rgba(253, 89, 73, .6);
180
  }
181
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
182
  @media (max-width: 600px) {
183
  .user-guide-modal {
184
  width: 90vw;
@@ -205,4 +223,9 @@ footer .social-icons {
205
  justify-content: center;
206
  line-height: 1;
207
  }
 
 
 
 
 
208
  }
 
179
  box-shadow: 0 6px 22px rgba(253, 89, 73, .6);
180
  }
181
 
182
+ .footer-watermark-row {
183
+ width: 100%;
184
+ text-align: right;
185
+ margin-top: -40px;
186
+ }
187
+
188
+ .footer-watermark {
189
+ color: #38bdf8;
190
+ font-weight: 700;
191
+ text-decoration: underline;
192
+ font-size: 1.1em;
193
+ transition: color 0.2s;
194
+ }
195
+
196
+ .footer-watermark:hover {
197
+ color: #137ec4;
198
+ }
199
+
200
  @media (max-width: 600px) {
201
  .user-guide-modal {
202
  width: 90vw;
 
223
  justify-content: center;
224
  line-height: 1;
225
  }
226
+
227
+ .footer-watermark-row {
228
+ text-align: center;
229
+ margin-top: 8px;
230
+ }
231
  }
src/app/footer/footer.component.html CHANGED
@@ -268,11 +268,15 @@
268
  </ul>
269
  </div>
270
  </div>
 
 
 
 
271
  </ng-container>
272
  <!-- MJ-Learn Footer -->
273
  <ng-container *ngSwitchCase="'MJ-Learn'">
274
- <p>© 2025 Majema Company. All rights reserved.</p>
275
- <a href="mailto:kundtjanst@majema.se" target="_blank">Contact Us</a> |
276
  <a href="#" (click)="openPrivacyPopup($event)">Privacy Policy</a> |
277
  <a href="#" (click)="openTermsPopup($event)">Terms & Conditions</a>
278
  <div class="social-icons">
@@ -327,11 +331,13 @@
327
  <li>By using Majema, you agree to these Terms and our Privacy Policy.</li>
328
  </ul>
329
  </li>
330
- <li><b>System requirements</b><br>
 
331
  <ul style="list-style: unset; margin-left: 1.25rem;">
332
  <li>Majema's digital learning materials work on computers, tablets and interactive whiteboards. Our digital learning materials are based on HTML5 and JavaScript. This means that older versions of browsers are not always fully supported. We recommend using an updated version of the Chrome browser to best experience our digital learning materials.</li>
333
  <li>Here you can download <a href="https://www.google.com/chrome/" target="_blank">Google Chrome for free</a>.</li>
334
- <li>For the best user experience, you should make sure these four points are met:
 
335
  <ol style="margin-left: 1.5rem;">
336
  <li>Make sure your browser is set to 100% zoom. This is important for the content to look correct on the screen.</li>
337
  <li>Update your browser.</li>
@@ -339,18 +345,21 @@
339
  <li>If you are using a tablet – update your operating system. This is done under settings.</li>
340
  </ol>
341
  </li>
342
- <li><b>Web browser</b><br>
 
343
  We recommend that you always update your browser to the latest version.<br>
344
  We test our digital learning materials against the following browsers: Chrome, Edge, Safari and Firefox.
345
  </li>
346
- <li><b>License management</b><br>
 
347
  All of our websites are licensed to apply to one teacher and class for one year from the date of activation.<br>
348
  If there is a student website, it is activated at the same time as you activate the teacher website.<br>
349
  To extend a license, you need to make a new purchase, in the webshop, through a retailer or with our customer service.<br>
350
  Should a license need to be transferred from one teacher to another, please contact our customer service and we will help you with this.<br>
351
  You can change your account details yourself under the My Account tab when you are logged in.
352
  </li>
353
- <li><b>Operating system</b><br>
 
354
  We recommend that you always update your operating system to the latest version.<br>
355
  <ul style="list-style: disc; margin-left: 1.5rem;">
356
  <li>Windows 7, 8, 10, 11</li>
@@ -366,6 +375,10 @@
366
  </ul>
367
  </div>
368
  </div>
 
 
 
 
369
  </ng-container>
370
  </ng-container>
371
  </footer>
 
268
  </ul>
269
  </div>
270
  </div>
271
+
272
+ <div class="footer-watermark-row">
273
+ <a class="footer-watermark" href="https://www.pykara.ai" target="_blank">www.pykara.ai</a>
274
+ </div>
275
  </ng-container>
276
  <!-- MJ-Learn Footer -->
277
  <ng-container *ngSwitchCase="'MJ-Learn'">
278
+ <p>© 2025 Majemaförlaget. All rights reserved.</p>
279
+ <a href="https://www.majema.se/pages/kontakta-kundtjanst" target="_blank">Contact Us</a> |
280
  <a href="#" (click)="openPrivacyPopup($event)">Privacy Policy</a> |
281
  <a href="#" (click)="openTermsPopup($event)">Terms & Conditions</a>
282
  <div class="social-icons">
 
331
  <li>By using Majema, you agree to these Terms and our Privacy Policy.</li>
332
  </ul>
333
  </li>
334
+ <li>
335
+ <b>System requirements</b><br>
336
  <ul style="list-style: unset; margin-left: 1.25rem;">
337
  <li>Majema's digital learning materials work on computers, tablets and interactive whiteboards. Our digital learning materials are based on HTML5 and JavaScript. This means that older versions of browsers are not always fully supported. We recommend using an updated version of the Chrome browser to best experience our digital learning materials.</li>
338
  <li>Here you can download <a href="https://www.google.com/chrome/" target="_blank">Google Chrome for free</a>.</li>
339
+ <li>
340
+ For the best user experience, you should make sure these four points are met:
341
  <ol style="margin-left: 1.5rem;">
342
  <li>Make sure your browser is set to 100% zoom. This is important for the content to look correct on the screen.</li>
343
  <li>Update your browser.</li>
 
345
  <li>If you are using a tablet – update your operating system. This is done under settings.</li>
346
  </ol>
347
  </li>
348
+ <li>
349
+ <b>Web browser</b><br>
350
  We recommend that you always update your browser to the latest version.<br>
351
  We test our digital learning materials against the following browsers: Chrome, Edge, Safari and Firefox.
352
  </li>
353
+ <li>
354
+ <b>License management</b><br>
355
  All of our websites are licensed to apply to one teacher and class for one year from the date of activation.<br>
356
  If there is a student website, it is activated at the same time as you activate the teacher website.<br>
357
  To extend a license, you need to make a new purchase, in the webshop, through a retailer or with our customer service.<br>
358
  Should a license need to be transferred from one teacher to another, please contact our customer service and we will help you with this.<br>
359
  You can change your account details yourself under the My Account tab when you are logged in.
360
  </li>
361
+ <li>
362
+ <b>Operating system</b><br>
363
  We recommend that you always update your operating system to the latest version.<br>
364
  <ul style="list-style: disc; margin-left: 1.5rem;">
365
  <li>Windows 7, 8, 10, 11</li>
 
375
  </ul>
376
  </div>
377
  </div>
378
+ <div class="footer-watermark-row">
379
+ <a class="footer-watermark" href="https://www.majema.se" target="_blank">www.majema.se</a>
380
+ </div>
381
+
382
  </ng-container>
383
  </ng-container>
384
  </footer>
src/app/home/home.component.html CHANGED
@@ -8,18 +8,7 @@
8
  <ul class="nav-links">
9
  <li><a routerLink="/chat" routerLinkActive="active-link">Chat</a></li>
10
  <li><a routerLink="/generate-questions" routerLinkActive="active-link">Grammar</a></li>
11
- <li>
12
- <span *ngIf="isVoiceDisabled; else voiceLink"
13
- class="nav-link nav-link--disabled"
14
- aria-disabled="true">
15
- Voice
16
- </span>
17
- <ng-template #voiceLink>
18
- <a class="nav-link" routerLink="/voice" routerLinkActive="active-link">
19
- Voice
20
- </a>
21
- </ng-template>
22
- </li>
23
  <li><a routerLink="/listen" routerLinkActive="active-link">Listening</a></li>
24
  <li><a routerLink="/reading" routerLinkActive="active-link">Reading</a></li>
25
  <li><a routerLink="/writing" routerLinkActive="active-link">Writing</a></li>
@@ -36,8 +25,8 @@
36
  Pronunciation Trainer
37
  </a>
38
  </li>
39
- <li><a routerLink="/personality-improvement" routerLinkActive="active-link">Personality Improvement</a></li>
40
- <li><a routerLink="/body-language-improvement" routerLinkActive="active-link">Body Language Improvement</a></li>
41
  </ul>
42
  </li>
43
  </ul>
 
8
  <ul class="nav-links">
9
  <li><a routerLink="/chat" routerLinkActive="active-link">Chat</a></li>
10
  <li><a routerLink="/generate-questions" routerLinkActive="active-link">Grammar</a></li>
11
+ <li><a class="nav-link--disabled" routerLink="/voice" routerLinkActive="active-link">Voice</a></li>
 
 
 
 
 
 
 
 
 
 
 
12
  <li><a routerLink="/listen" routerLinkActive="active-link">Listening</a></li>
13
  <li><a routerLink="/reading" routerLinkActive="active-link">Reading</a></li>
14
  <li><a routerLink="/writing" routerLinkActive="active-link">Writing</a></li>
 
25
  Pronunciation Trainer
26
  </a>
27
  </li>
28
+ <li><a class="nav-link--disabled" routerLink="/personality-improvement" routerLinkActive="active-link">Personality Improvement</a></li>
29
+ <li><a class="nav-link--disabled" routerLink="/body-language-improvement" routerLinkActive="active-link">Body Language Improvement</a></li>
30
  </ul>
31
  </li>
32
  </ul>
src/app/home/home.component.ts CHANGED
@@ -19,7 +19,7 @@ export class HomeComponent implements AfterViewInit, OnInit, OnDestroy {
19
  showAccountMenu = false;
20
  showPrivacyPopup = false;
21
  showTermsPopup = false;
22
- isVoiceDisabled = true;
23
 
24
  // -------------------- Authentication State --------------------
25
  isAuthenticated = false;
 
19
  showAccountMenu = false;
20
  showPrivacyPopup = false;
21
  showTermsPopup = false;
22
+
23
 
24
  // -------------------- Authentication State --------------------
25
  isAuthenticated = false;
src/app/shared/brand.service.ts CHANGED
@@ -42,7 +42,7 @@ export class BrandService {
42
  constructor() {
43
  // Detect brand by URL and port
44
  const url = window.location.href;
45
- const port = window.location.port;
46
  let brandName: BrandName = 'Py-Learn'; // default to Py-Learn for type safety
47
  let logoPath = 'assets/images/pykara-logo.png';
48
 
@@ -53,17 +53,17 @@ export class BrandService {
53
  } else if (url.includes('majemaai-mj-learn')) {
54
  brandName = 'MJ-Learn';
55
  logoPath = 'assets/images/majema-logo.png';
56
- this.showFooter = false;
57
  }
58
  //else if (url.includes('localhost')) {
59
- // if (port === '4300') {
60
  // brandName = 'Py-Learn';
61
  // logoPath = 'assets/images/pykara-logo.png';
62
  // this.showFooter = true;
63
- // } else if (port === '4200') {
64
  // brandName = 'MJ-Learn';
65
- // logoPath = 'assets/images/Majema.png';
66
- // this.showFooter = false;
67
  // }
68
  //}
69
 
 
42
  constructor() {
43
  // Detect brand by URL and port
44
  const url = window.location.href;
45
+ //const port = window.location.port;
46
  let brandName: BrandName = 'Py-Learn'; // default to Py-Learn for type safety
47
  let logoPath = 'assets/images/pykara-logo.png';
48
 
 
53
  } else if (url.includes('majemaai-mj-learn')) {
54
  brandName = 'MJ-Learn';
55
  logoPath = 'assets/images/majema-logo.png';
56
+ this.showFooter = true;
57
  }
58
  //else if (url.includes('localhost')) {
59
+ // if (port === '4200') {
60
  // brandName = 'Py-Learn';
61
  // logoPath = 'assets/images/pykara-logo.png';
62
  // this.showFooter = true;
63
+ // } else if (port === '4300') {
64
  // brandName = 'MJ-Learn';
65
+ // logoPath = 'assets/images/majema-logo.png';
66
+ // this.showFooter = true;
67
  // }
68
  //}
69
 
src/app/sign-up/sign-up.component.html CHANGED
@@ -108,7 +108,7 @@
108
 
109
  <div class="create-footer">
110
  <b>
111
- © {{ brand.name === 'Py-Learn' ? 'Pykara Technologies' : 'Majema Company' }}, 2025. All rights reserved.
112
  </b>
113
  </div>
114
  </form>
 
108
 
109
  <div class="create-footer">
110
  <b>
111
+ © {{ brand.name === 'Py-Learn' ? 'Pykara Technologies' : 'Majemaförlaget' }}, 2025. All rights reserved.
112
  </b>
113
  </div>
114
  </form>
src/assets/images/{Majema.png → majema-logo.png} RENAMED
File without changes