5 次程式碼提交

作者 SHA1 備註 提交日期
  tomit4 11ab073da2 :wrench: Brevo's email api changed again 2 年之前
  j b586b7ad64 :recycle: alter link for icomoon font 2 年之前
  j 73f5b0b339 :recycle: commenting out auth def in profile.js 2 年之前
  j 59d4dea0c4 :recycle: try not reregister jwt with server 2 年之前
  j dfef2dc72f :recycle: stub some test stuff 2 年之前

+ 0
- 6
backend/lib/plugins/profile.js 查看文件

38
         await server.registerModel(ZipCodeModel)
38
         await server.registerModel(ZipCodeModel)
39
         await server.registerModel(MatchQueueModel)
39
         await server.registerModel(MatchQueueModel)
40
 
40
 
41
-        // TODO: Need for testing but can't uncomment
42
-        // const mainApp = server.registrations['main-app-plugin']
43
-        // const jwtOptions = JwtStrategy(mainApp.options)
44
-        // server.auth.strategy('default_jwt', 'jwt', jwtOptions)
45
-        // server.auth.default('default_jwt')
46
-
47
         // Bind to global context
41
         // Bind to global context
48
         // So we can use Objection transactions
42
         // So we can use Objection transactions
49
         server.bind({
43
         server.bind({

+ 2
- 3
backend/lib/services/user.js 查看文件

8
 
8
 
9
 // Configuration for Brevo
9
 // Configuration for Brevo
10
 const Brevo = require('@getbrevo/brevo')
10
 const Brevo = require('@getbrevo/brevo')
11
-const defaultClient = Brevo.ApiClient.instance
12
-const apiKey = defaultClient.authentications['api-key']
13
-apiKey.apiKey = process.env.BREVO_KEY
14
 const apiInstance = new Brevo.TransactionalEmailsApi()
11
 const apiInstance = new Brevo.TransactionalEmailsApi()
12
+const apiKey = apiInstance.authentications.apiKey
13
+apiKey.apiKey = process.env.BREVO_KEY
15
 const sendSmtpEmail = new Brevo.SendSmtpEmail()
14
 const sendSmtpEmail = new Brevo.SendSmtpEmail()
16
 
15
 
17
 // TODO: Consider implementing, nice use of SecurePassword,
16
 // TODO: Consider implementing, nice use of SecurePassword,

+ 3
- 7
backend/package-lock.json 查看文件

1926
             }
1926
             }
1927
         },
1927
         },
1928
         "node_modules/caniuse-lite": {
1928
         "node_modules/caniuse-lite": {
1929
-            "version": "1.0.30001565",
1930
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz",
1931
-            "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==",
1929
+            "version": "1.0.30001423",
1930
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001423.tgz",
1931
+            "integrity": "sha512-09iwWGOlifvE1XuHokFMP7eR38a0JnajoyL3/i87c8ZjRWRrdKo1fqjNfugfBD0UDBIOz0U+jtNhJ0EPm1VleQ==",
1932
             "dev": true,
1932
             "dev": true,
1933
             "funding": [
1933
             "funding": [
1934
                 {
1934
                 {
1938
                 {
1938
                 {
1939
                     "type": "tidelift",
1939
                     "type": "tidelift",
1940
                     "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
1940
                     "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
1941
-                },
1942
-                {
1943
-                    "type": "github",
1944
-                    "url": "https://github.com/sponsors/ai"
1945
                 }
1941
                 }
1946
             ]
1942
             ]
1947
         },
1943
         },

+ 0
- 5
backend/tests/matchqueue.spec.js 查看文件

60
      */
60
      */
61
     server.registerModel = () => {}
61
     server.registerModel = () => {}
62
     server.models = () => ({ Aspect, AspectLabel, MatchQueue, Profile })
62
     server.models = () => ({ Aspect, AspectLabel, MatchQueue, Profile })
63
-    server.registrations = {
64
-        'main-app-plugin': {
65
-            options: {},
66
-        },
67
-    }
68
     /**
63
     /**
69
      * Register Routes and Services as usual
64
      * Register Routes and Services as usual
70
      */
65
      */

+ 0
- 5
backend/tests/profile.spec.js 查看文件

49
      */
49
      */
50
     server.registerModel = () => {}
50
     server.registerModel = () => {}
51
     server.models = () => ({ Profile, Tag })
51
     server.models = () => ({ Profile, Tag })
52
-    server.registrations = {
53
-        'main-app-plugin': {
54
-            options: {},
55
-        },
56
-    }
57
     /**
52
     /**
58
      * Register Routes and Services as usual
53
      * Register Routes and Services as usual
59
      */
54
      */

+ 0
- 5
backend/tests/respond.spec.js 查看文件

52
      */
52
      */
53
     server.registerModel = () => {}
53
     server.registerModel = () => {}
54
     server.models = () => ({ Response, ResponseKey })
54
     server.models = () => ({ Response, ResponseKey })
55
-    server.registrations = {
56
-        'main-app-plugin': {
57
-            options: {},
58
-        },
59
-    }
60
     /**
55
     /**
61
      * Register Routes and Services as usual
56
      * Register Routes and Services as usual
62
      */
57
      */

+ 0
- 5
backend/tests/score.spec.js 查看文件

93
         Profile,
93
         Profile,
94
         ZipCode,
94
         ZipCode,
95
     })
95
     })
96
-    server.registrations = {
97
-        'main-app-plugin': {
98
-            options: {},
99
-        },
100
-    }
101
     /**
96
     /**
102
      * Register Routes and Services as usual
97
      * Register Routes and Services as usual
103
      */
98
      */

+ 0
- 5
backend/tests/update.spec.js 查看文件

66
      */
66
      */
67
     server.registerModel = () => {}
67
     server.registerModel = () => {}
68
     server.models = () => ({ Response, ResponseKey })
68
     server.models = () => ({ Response, ResponseKey })
69
-    server.registrations = {
70
-        'main-app-plugin': {
71
-            options: {},
72
-        },
73
-    }
74
     /**
69
     /**
75
      * Register Routes and Services as usual
70
      * Register Routes and Services as usual
76
      */
71
      */

+ 41
- 40
frontend/assets/sass/icons.scss 查看文件

1
 @font-face {
1
 @font-face {
2
     font-family: 'icomoon';
2
     font-family: 'icomoon';
3
-    src: url('/assets/fonts/icomoon.eot?6rmrq3');
4
-    src: url('/assets/fonts/icomoon.eot?6rmrq3#iefix')
5
-            format('embedded-opentype'),
6
-        url('/assets/fonts/icomoon.ttf?6rmrq3') format('truetype'),
7
-        url('/assets/fonts/icomoon.woff?6rmrq3') format('woff'),
8
-        url('/assets/fonts/icomoon.svg?6rmrq3#icomoon') format('svg');
3
+    src: url('assets/fonts/icomoon.eot?6rmrq3');
4
+    src: url('assets/fonts/icomoon.eot?6rmrq3#iefix') format('embedded-opentype'),
5
+        url('assets/fonts/icomoon.ttf?6rmrq3') format('truetype'),
6
+        url('assets/fonts/icomoon.woff?6rmrq3') format('woff'),
7
+        url('assets/fonts/icomoon.svg?6rmrq3#icomoon') format('svg');
9
     font-weight: normal;
8
     font-weight: normal;
10
     font-style: normal;
9
     font-style: normal;
11
     font-display: block;
10
     font-display: block;
12
 }
11
 }
13
 
12
 
14
-[class^='icon-'],
15
-[class*=' icon-'] {
13
+[class^="icon-"],
14
+[class*=" icon-"] {
16
     /* use !important to prevent issues with browser extensions that change fonts */
15
     /* use !important to prevent issues with browser extensions that change fonts */
17
     font-family: 'icomoon' !important;
16
     font-family: 'icomoon' !important;
18
     speak: never;
17
     speak: never;
27
     -moz-osx-font-smoothing: grayscale;
26
     -moz-osx-font-smoothing: grayscale;
28
 
27
 
29
     &.icon-cross:before {
28
     &.icon-cross:before {
30
-        content: '\e911';
29
+        content: "\e911";
31
     }
30
     }
32
 
31
 
33
     &.icon-dots-three-horizontal:before {
32
     &.icon-dots-three-horizontal:before {
34
-        content: '\e917';
33
+        content: "\e917";
35
     }
34
     }
36
 
35
 
37
     &.icon-dots-three-vertical:before {
36
     &.icon-dots-three-vertical:before {
38
-        content: '\e91a';
37
+        content: "\e91a";
39
     }
38
     }
40
 
39
 
41
     &.icon-address:before {
40
     &.icon-address:before {
42
-        content: '\e900';
41
+        content: "\e900";
43
     }
42
     }
44
 
43
 
45
     &.icon-area-graph:before {
44
     &.icon-area-graph:before {
46
-        content: '\e901';
45
+        content: "\e901";
47
     }
46
     }
48
 
47
 
49
     &.icon-calendar:before {
48
     &.icon-calendar:before {
50
-        content: '\e902';
49
+        content: "\e902";
51
     }
50
     }
52
 
51
 
53
     &.icon-certified:before {
52
     &.icon-certified:before {
54
-        content: '\e903';
53
+        content: "\e903";
55
     }
54
     }
56
 
55
 
57
     &.icon-chat:before {
56
     &.icon-chat:before {
58
-        content: '\e904';
57
+        content: "\e904";
59
     }
58
     }
60
 
59
 
61
     &.icon-checkmark:before {
60
     &.icon-checkmark:before {
62
-        content: '\e905';
61
+        content: "\e905";
63
     }
62
     }
64
 
63
 
65
     &.icon-clock:before {
64
     &.icon-clock:before {
66
-        content: '\e906';
65
+        content: "\e906";
67
     }
66
     }
68
 
67
 
69
     &.icon-cog:before {
68
     &.icon-cog:before {
70
-        content: '\e907';
69
+        content: "\e907";
71
     }
70
     }
72
 
71
 
73
     &.icon-compass:before {
72
     &.icon-compass:before {
74
-        content: '\e908';
73
+        content: "\e908";
75
     }
74
     }
76
 
75
 
77
     &.icon-emoji-happy:before {
76
     &.icon-emoji-happy:before {
78
-        content: '\e909';
77
+        content: "\e909";
79
     }
78
     }
80
 
79
 
81
     &.icon-envelope:before {
80
     &.icon-envelope:before {
82
-        content: '\e90a';
81
+        content: "\e90a";
83
     }
82
     }
84
 
83
 
85
     &.icon-graduation-cap:before {
84
     &.icon-graduation-cap:before {
86
-        content: '\e90b';
85
+        content: "\e90b";
87
     }
86
     }
88
 
87
 
89
     &.icon-guage:before {
88
     &.icon-guage:before {
90
-        content: '\e90c';
89
+        content: "\e90c";
91
     }
90
     }
92
 
91
 
93
     &.icon-heart:before {
92
     &.icon-heart:before {
94
-        content: '\e90d';
93
+        content: "\e90d";
95
     }
94
     }
96
 
95
 
97
     &.icon-home:before {
96
     &.icon-home:before {
98
-        content: '\e90e';
97
+        content: "\e90e";
99
     }
98
     }
100
 
99
 
101
     &.icon-location:before {
100
     &.icon-location:before {
102
-        content: '\e90f';
101
+        content: "\e90f";
103
     }
102
     }
104
 
103
 
105
     &.icon-lock:before {
104
     &.icon-lock:before {
106
-        content: '\e910';
105
+        content: "\e910";
107
     }
106
     }
108
 
107
 
109
     &.icon-paper-plane:before {
108
     &.icon-paper-plane:before {
110
-        content: '\e912';
109
+        content: "\e912";
111
     }
110
     }
112
 
111
 
113
     &.icon-people:before {
112
     &.icon-people:before {
114
-        content: '\e913';
113
+        content: "\e913";
115
     }
114
     }
116
 
115
 
117
     &.icon-plus:before {
116
     &.icon-plus:before {
118
-        content: '\e914';
117
+        content: "\e914";
119
     }
118
     }
120
 
119
 
121
     &.icon-price-ribbon:before {
120
     &.icon-price-ribbon:before {
122
-        content: '\e915';
121
+        content: "\e915";
123
     }
122
     }
124
 
123
 
125
     &.icon-star:before {
124
     &.icon-star:before {
126
-        content: '\e916';
125
+        content: "\e916";
127
     }
126
     }
128
 
127
 
129
     &.icon-tools:before {
128
     &.icon-tools:before {
130
-        content: '\e918';
129
+        content: "\e918";
131
     }
130
     }
132
 
131
 
133
     &.icon-truck:before {
132
     &.icon-truck:before {
134
-        content: '\e919';
133
+        content: "\e919";
135
     }
134
     }
136
 
135
 
137
     &.icon-search:before {
136
     &.icon-search:before {
138
-        content: '\e986';
137
+        content: "\e986";
139
     }
138
     }
140
 
139
 
141
     &.icon-eye:before {
140
     &.icon-eye:before {
142
-        content: '\e9ce';
141
+        content: "\e9ce";
143
     }
142
     }
144
 
143
 
145
     &.icon-eye-blocked:before {
144
     &.icon-eye-blocked:before {
146
-        content: '\e9d1';
147
-    }
148
-}
145
+        content: "\e9d1";
146
+        }
147
+        
148
+
149
+    }

+ 2
- 2
frontend/src/utils/db.js 查看文件

1
-const domain = import.meta.env ? import.meta.env.VITE_API_HOST : 'localhost'
2
-const port = import.meta.env ? import.meta.env.VITE_API_PORT : 3000
1
+const domain = import.meta.env.VITE_API_HOST
2
+const port = import.meta.env.VITE_API_PORT
3
 const httpProtocol = `http`
3
 const httpProtocol = `http`
4
 const prefix = 'api'
4
 const prefix = 'api'
5
 const remote = `${httpProtocol}://${domain}:${port}/${prefix}`
5
 const remote = `${httpProtocol}://${domain}:${port}/${prefix}`

Loading…
取消
儲存