diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ed207fc9..2a8071035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: run: | echo "ES_INDEX=${{secrets.ES_INDEX_TEST}}-deploy-preview" >> $GITHUB_ENV if: github.ref_name!='nuxt3.x' - - name: Sets env vars for main merge + - name: Sets env vars for nuxt3.x merge run: | echo "ES_INDEX=${{secrets.ES_INDEX_TEST}}" >> $GITHUB_ENV if: github.ref_name=='nuxt3.x' diff --git a/gql/queries/Homepage.gql b/gql/queries/Homepage.gql index 09cdd2ee0..88266f341 100644 --- a/gql/queries/Homepage.gql +++ b/gql/queries/Homepage.gql @@ -1,4 +1,4 @@ -#import "~/gql/fragments/Image" +#import "../gql/fragments/Image.gql" query Homepage { entry(section: "homepage") { diff --git a/layouts/default.vue b/layouts/default.vue index 55d71e0d5..f26a0bed9 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -45,18 +45,18 @@ const classes = computed(() => [
- + - - - + + + - +
+ + +
diff --git a/layouts/impact.vue b/layouts/impact.vue index 563d9d12a..7dc6e1b0b 100644 --- a/layouts/impact.vue +++ b/layouts/impact.vue @@ -1,7 +1,8 @@ - + diff --git a/pages/impact/[year]/index.vue b/pages/impact/[year]/index.vue new file mode 100644 index 000000000..491e9f1ae --- /dev/null +++ b/pages/impact/[year]/index.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/pages/index.vue b/pages/index.vue index 5d267e0b7..c355856ef 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,7 +1,315 @@ - + + + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac6eaf5f6..be606d210 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,9 @@ devDependencies: eslint-plugin-cypress: specifier: ^2.15.1 version: 2.15.1(eslint@8.49.0) + lodash: + specifier: ^4.17.21 + version: 4.17.21 nuxt: specifier: ^v3.7.3 version: 3.7.3(@types/node@18.17.3)(eslint@8.49.0)(sass@1.66.1)(typescript@5.2.2) @@ -50,8 +53,8 @@ devDependencies: specifier: ^5.5.0 version: 5.5.0 ucla-library-website-components: - specifier: 2.39.0-alpha.10 - version: 2.39.0-alpha.10(typescript@5.2.2)(vue-router@4.2.5)(vue@3.3.4) + specifier: 2.39.0-alpha.15 + version: 2.39.0-alpha.15(typescript@5.2.2)(vue-router@4.2.5)(vue@3.3.4) packages: @@ -479,6 +482,13 @@ packages: '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.20) dev: true + /@babel/runtime@7.23.2: + resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.0 + dev: true + /@babel/standalone@7.22.20: resolution: {integrity: sha512-1W+v64N5c4yEQH1WZDGTzChpxfJ23QjmeH6qPT8CSqLV1kwKkpajMSK/xpD2aQkvy+Hfw4WaMMOhSMQtMC+PNw==} engines: {node: '>=6.9.0'} @@ -3557,6 +3567,13 @@ packages: engines: {node: '>= 12'} dev: true + /date-fns@2.30.0: + resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} + engines: {node: '>=0.11'} + dependencies: + '@babel/runtime': 7.23.2 + dev: true + /dayjs@1.11.10: resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} dev: true @@ -7304,6 +7321,10 @@ packages: redis-errors: 1.2.0 dev: true + /regenerator-runtime@0.14.0: + resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + dev: true + /regexp-tree@0.1.27: resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} hasBin: true @@ -8107,12 +8128,13 @@ packages: resolution: {integrity: sha512-Y2qRlOdTbtU03S+/0gRQn/h2SypxP0QEPxkqLKDDVgDePR9tepf7iOCkWWUwfvcRtyEWtQirsC20e13kKAbBLg==} dev: true - /ucla-library-website-components@2.39.0-alpha.10(typescript@5.2.2)(vue-router@4.2.5)(vue@3.3.4): - resolution: {integrity: sha512-KcAKuVPePPV4CqJXTb0M+Q5HOj1CdI6f6mh9J0pGzxPf5Y8yC7282wtuJKiKmCw1dRjM7vV9WR0pZjm/MqbF/A==} + /ucla-library-website-components@2.39.0-alpha.15(typescript@5.2.2)(vue-router@4.2.5)(vue@3.3.4): + resolution: {integrity: sha512-tQ36OI4Ld88RI+Ep+HtjHgWdSNUUbq1gD898tvNSPoJ2Uu17OIpCTh8WInRyAran0Jf6ATcoOfhI+6OWfmsefA==} peerDependencies: vue: ^3.3.4 vue-router: ^4.2.4 dependencies: + date-fns: 2.30.0 lodash: 4.17.21 pinia: 2.1.6(typescript@5.2.2)(vue@3.3.4) vue: 3.3.4