Skip to content

Commit 8d4f04d

Browse files
authored
Merge pull request #105 from ContentSquare/refactor/templates-page-to-tailwind
refactor(base-app): use tailwind in templates page
2 parents fed7ff7 + 45a0983 commit 8d4f04d

43 files changed

Lines changed: 352 additions & 221 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/base-app/src-extension/reading-tools.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// READING TOOLS
2-
import { SettingsReadingTool } from '../src/interfaces/settingsReadingTool'
2+
import type { SettingsReadingTool } from '../src/entities/readingTools'
33

44
const BASE_COLOR = '#000000'
55
const BASE_RULE_SIZE = 1

apps/base-app/src/app/ui/providers/withRouter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue'
22
import VueRouter, { type RouteConfig } from 'vue-router'
33

4-
import { PopupPage } from '@/pages/popup'
4+
import { MainMenuPage } from '@/pages/mainMenu'
55

66
export function withRouter() {
77
Vue.use(VueRouter)
@@ -10,12 +10,12 @@ export function withRouter() {
1010
{
1111
path: '/',
1212
name: 'main',
13-
component: PopupPage
13+
component: MainMenuPage
1414
},
1515
{
1616
path: '/templates',
1717
name: 'templates',
18-
component: () => import('@/views/TemplateSelect.vue')
18+
component: async () => (await import('@/pages/templates')).TemplatesPage
1919
},
2020
{
2121
path: '/options',

apps/base-app/src/chrome/utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { SettingsReadingTool } from '@/interfaces/settingsReadingTool'
2-
import { buildDefaultSettingsReadingTool } from '@/constants/defaultSettingsReadingTool'
1+
import { type SettingsReadingTool, buildDefaultSettingsReadingTool } from '@/entities/readingTools'
32
import { getQueryString } from '@/shared/lib/url'
43

54
const getCurrentTab = async (): Promise<chrome.tabs.Tab> => {

apps/base-app/src/chrome/utilsFactory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as chromeUtils from '@/chrome/utils'
22
import * as chromeMock from './utilsMock'
3-
import type { SettingsReadingTool } from '@/interfaces/settingsReadingTool'
3+
import type { SettingsReadingTool } from '@/entities/readingTools'
44
import type VueRouter from 'vue-router'
55

66
export interface ChromeUtils {

apps/base-app/src/chrome/utilsMock.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { SettingsReadingTool } from '@/interfaces/settingsReadingTool'
2-
import { buildDefaultSettingsReadingTool } from '@/constants/defaultSettingsReadingTool'
1+
import { type SettingsReadingTool, buildDefaultSettingsReadingTool } from '@/entities/readingTools'
32
import type VueRouter from 'vue-router'
43

54
const getCurrentTab = async (): Promise<chrome.tabs.Tab> => {

apps/base-app/src/components/TemplateSelector.vue

Lines changed: 0 additions & 29 deletions
This file was deleted.

apps/base-app/src/components/TemplateSelectorOption.vue

Lines changed: 0 additions & 59 deletions
This file was deleted.

apps/base-app/src/constants/defaultSettingsReadingTool.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export type { SettingsReadingTool } from './model/settingsReadingTool'
2+
export { buildDefaultSettingsReadingTool } from './model/defaultSettingsReadingTool'
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import type { SettingsReadingTool } from './settingsReadingTool'
2+
3+
export const buildDefaultSettingsReadingTool = (): SettingsReadingTool => {
4+
return {
5+
opacity: '33',
6+
thickness: '1'
7+
}
8+
}

0 commit comments

Comments
 (0)