Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning up code #150

Merged
merged 6 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/update-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Update staging and development
on:
push:
branches:
- master
pull_request:
types: [labeled, synchronize]

jobs:
update-staging:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'On Staging')
steps:
- uses: actions/checkout@v3
- name: 🖇️ Merge current branch into staging
uses: devmasx/[email protected]
with:
type: now
target_branch: 'staging'
github_token: ${{ github.token }}

update-development:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'On Staging') || contains(github.event.pull_request.labels.*.name, 'On Development')
steps:
- uses: actions/checkout@v3
- name: 🖇️ Merge current branch into development
uses: devmasx/[email protected]
with:
type: now
target_branch: 'development'
github_token: ${{ github.token }}
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 18.13.0
75 changes: 14 additions & 61 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,51 +31,25 @@ import { ContentAnimationComponent } from './page/component/content-animation/co
import { CalltoactionComponent } from './page/component/calltoaction/calltoaction.component';
import { ModalComponent } from './page/component/modal/modal.component';
import { ContentSpacerComponent } from './page/component/content-spacer/content-spacer.component';
import { TrainingTipComponent } from './page/component/training-tip/training-tip.component';
import { ContentFallbackComponent } from './page/component/content-fallback/content-fallback.component';
import { PageNewComponent } from './new-page/page.component';
import { PageHeaderNewComponent } from './new-page/component/page-header/page-header.component';
import { TractPageNewComponent } from './new-page/component/tract-page/tract-page.component';
import { PageHeroNewComponent } from './new-page/component/page-hero/page-hero.component';
import { ContentImageNewComponent } from './new-page/component/content-image/content-image.component';
import { ContentParagraphNewComponent } from './new-page/component/content-paragraph/content-paragraph.component';
import { ContentFormNewComponent } from './new-page/component/content-form/content-form.component';
import { CardNewComponent } from './new-page/component/card/card.component';
import { ContentTextNewComponent } from './new-page/component/content-text/content-text.component';
import { ContentButtonNewComponent } from './new-page/component/content-button/content-button.component';
import { ContentLinkNewComponent } from './new-page/component/content-link/content-link.component';
import { ContentInputNewComponent } from './new-page/component/content-input/content-input.component';
import { ContentVideoNewComponent } from './new-page/component/content-video/content-video.component';
import { ContentTabsNewComponent } from './new-page/component/content-tabs/content-tabs.component';
import { ContentAccordionNewComponent } from './new-page/component/content-accordion/content-accordion.component';
import { ContentAnimationNewComponent } from './new-page/component/content-animation/content-animation.component';
import { CalltoactionNewComponent } from './new-page/component/calltoaction/calltoaction.component';
import { ModalNewComponent } from './new-page/component/modal/modal.component';
import { ContentSpacerNewComponent } from './new-page/component/content-spacer/content-spacer.component';
import { ContentRepeaterNewComponent } from './new-page/component/content-repeater/content-repeater.component';
import { ContentMultiselectNewComponent } from './new-page/component/content-multiselect/content-multiselect.component';
import { ContentMultiselectOptionNewComponent } from './new-page/component/content-multiselect-option/content-multiselect-option.component';
import { ContentFlowNewComponent } from './new-page/component/content-flow/content-flow.component';
import { ContentFlowItemNewComponent } from './new-page/component/content-flow-item/content-flow-item.component';
import { ContentCardNewComponent } from './new-page/component/content-card/content-card.component';
import { ContentRepeaterComponent } from './page/component/content-repeater/content-repeater.component';
import { ContentMultiselectComponent } from './page/component/content-multiselect/content-multiselect.component';
import { ContentMultiselectOptionComponent } from './page/component/content-multiselect-option/content-multiselect-option.component';
import { ContentFlowComponent } from './page/component/content-flow/content-flow.component';
import { ContentFlowItemComponent } from './page/component/content-flow-item/content-flow-item.component';
import { ContentCardComponent } from './page/component/content-card/content-card.component';

const appRoutes: Routes = [
{ path: 'old/:langid/embed/:bookid', component: PageComponent },
{
path: 'old/:langid/:bookid/:page',
component: PageComponent
},
{
path: ':langid/:bookid',
redirectTo: ':langid/:bookid/0',
pathMatch: 'full'
},
{ path: ':langid', component: HeaderComponent },
{ path: '', component: HeaderComponent },
{ path: ':langid/embed/:bookid', component: PageNewComponent },
{ path: ':langid/embed/:bookid', component: PageComponent },
{
path: ':langid/:bookid/:page',
component: PageNewComponent
component: PageComponent
}
];

Expand All @@ -92,7 +66,6 @@ export function playerFactory() {
SharingModalComponent,
LoaderComponent,
PageComponent,
PageNewComponent,
PageHeaderComponent,
TractPageComponent,
PageHeroComponent,
Expand All @@ -111,32 +84,12 @@ export function playerFactory() {
CalltoactionComponent,
ModalComponent,
ContentSpacerComponent,
TrainingTipComponent,
ContentFallbackComponent,
PageHeaderNewComponent,
TractPageNewComponent,
PageHeroNewComponent,
ContentImageNewComponent,
ContentParagraphNewComponent,
ContentFormNewComponent,
CardNewComponent,
ContentTextNewComponent,
ContentButtonNewComponent,
ContentLinkNewComponent,
ContentInputNewComponent,
ContentVideoNewComponent,
ContentTabsNewComponent,
ContentAccordionNewComponent,
ContentAnimationNewComponent,
CalltoactionNewComponent,
ModalNewComponent,
ContentSpacerNewComponent,
ContentRepeaterNewComponent,
ContentMultiselectNewComponent,
ContentMultiselectOptionNewComponent,
ContentFlowNewComponent,
ContentFlowItemNewComponent,
ContentCardNewComponent
ContentRepeaterComponent,
ContentMultiselectComponent,
ContentMultiselectOptionComponent,
ContentFlowComponent,
ContentFlowItemComponent,
ContentCardComponent
],
imports: [
BrowserModule,
Expand Down

This file was deleted.

This file was deleted.

62 changes: 0 additions & 62 deletions src/app/new-page/component/calltoaction/calltoaction.component.ts

This file was deleted.

12 changes: 0 additions & 12 deletions src/app/new-page/component/card/card.component.css

This file was deleted.

18 changes: 0 additions & 18 deletions src/app/new-page/component/card/card.component.html

This file was deleted.

78 changes: 0 additions & 78 deletions src/app/new-page/component/card/card.component.ts

This file was deleted.

This file was deleted.

Loading