From 91390b9078fe59168b234c10ea033b7ad7389f94 Mon Sep 17 00:00:00 2001 From: Dagmawit Getachew Date: Mon, 1 Aug 2022 20:20:06 +0300 Subject: [PATCH 1/8] [Web]Created blog post UI --- .../components/dagmawit/Dagmawit-BlogPost.vue | 41 +++++++++++++++++++ .../pages/dagmawit/_id.vue | 0 .../pages/dagmawit/index.vue | 19 +++++++++ starter-project-web-vue2/pages/index.vue | 6 +++ starter-project-web-vue2/store/dagmawit.js | 0 starter_project_mobile/pubspec.lock | 16 ++++---- starter_project_mobile_2022/pubspec.lock | 18 ++++---- .../linux/flutter/generated_plugins.cmake | 8 ++++ starter_project_mobile_new/pubspec.lock | 23 ++++------- .../lib/pubspec.lock | 16 ++++---- starter_testing_project_mobile/pubspec.lock | 16 ++++---- 11 files changed, 115 insertions(+), 48 deletions(-) create mode 100644 starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue create mode 100644 starter-project-web-vue2/pages/dagmawit/_id.vue create mode 100644 starter-project-web-vue2/pages/dagmawit/index.vue create mode 100644 starter-project-web-vue2/store/dagmawit.js diff --git a/starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue b/starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue new file mode 100644 index 00000000..9ada93cf --- /dev/null +++ b/starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue @@ -0,0 +1,41 @@ + + + + + + + + + diff --git a/starter-project-web-vue2/pages/dagmawit/_id.vue b/starter-project-web-vue2/pages/dagmawit/_id.vue new file mode 100644 index 00000000..e69de29b diff --git a/starter-project-web-vue2/pages/dagmawit/index.vue b/starter-project-web-vue2/pages/dagmawit/index.vue new file mode 100644 index 00000000..ced75acd --- /dev/null +++ b/starter-project-web-vue2/pages/dagmawit/index.vue @@ -0,0 +1,19 @@ + + + \ No newline at end of file diff --git a/starter-project-web-vue2/pages/index.vue b/starter-project-web-vue2/pages/index.vue index d55af3a6..e823e9ed 100644 --- a/starter-project-web-vue2/pages/index.vue +++ b/starter-project-web-vue2/pages/index.vue @@ -38,6 +38,12 @@ export default { link: '/abraham', }, + { + name: "Dagmawit Getachew", + description: 'Summer Intern', + link: + '/dagmawit', + }, ], } }, diff --git a/starter-project-web-vue2/store/dagmawit.js b/starter-project-web-vue2/store/dagmawit.js new file mode 100644 index 00000000..e69de29b diff --git a/starter_project_mobile/pubspec.lock b/starter_project_mobile/pubspec.lock index c8f011d9..eaf83836 100644 --- a/starter_project_mobile/pubspec.lock +++ b/starter_project_mobile/pubspec.lock @@ -147,7 +147,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" convert: dependency: transitive description: @@ -182,7 +182,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -311,7 +311,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -353,7 +353,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_provider: dependency: transitive description: @@ -477,7 +477,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -519,7 +519,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" timing: dependency: transitive description: @@ -540,7 +540,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" watcher: dependency: transitive description: @@ -577,5 +577,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.0.0" diff --git a/starter_project_mobile_2022/pubspec.lock b/starter_project_mobile_2022/pubspec.lock index 62f9b250..7a7236b0 100644 --- a/starter_project_mobile_2022/pubspec.lock +++ b/starter_project_mobile_2022/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" crypto: dependency: transitive description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" lints: dependency: transitive description: @@ -162,7 +162,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -176,7 +176,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_provider: dependency: transitive description: @@ -272,7 +272,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -314,7 +314,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" typed_data: dependency: transitive description: @@ -384,7 +384,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" win32: dependency: transitive description: @@ -400,5 +400,5 @@ packages: source: hosted version: "0.2.0+1" sdks: - dart: ">=2.16.1 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.10.0" diff --git a/starter_project_mobile_new/linux/flutter/generated_plugins.cmake b/starter_project_mobile_new/linux/flutter/generated_plugins.cmake index 51436ae8..2e1de87a 100644 --- a/starter_project_mobile_new/linux/flutter/generated_plugins.cmake +++ b/starter_project_mobile_new/linux/flutter/generated_plugins.cmake @@ -5,6 +5,9 @@ list(APPEND FLUTTER_PLUGIN_LIST ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/starter_project_mobile_new/pubspec.lock b/starter_project_mobile_new/pubspec.lock index 66c4fb7d..779e035b 100644 --- a/starter_project_mobile_new/pubspec.lock +++ b/starter_project_mobile_new/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -94,7 +94,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "0.1.4" meta: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sky_engine: dependency: transitive description: flutter @@ -120,7 +120,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -155,20 +155,13 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.16.0-80.1.beta <3.0.0" + dart: ">=2.17.0-0 <3.0.0" diff --git a/starter_testing_project_mobile/lib/pubspec.lock b/starter_testing_project_mobile/lib/pubspec.lock index eed8e04b..373edbb5 100644 --- a/starter_testing_project_mobile/lib/pubspec.lock +++ b/starter_testing_project_mobile/lib/pubspec.lock @@ -140,7 +140,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" convert: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" file: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -318,7 +318,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" pedantic: dependency: transitive description: @@ -379,7 +379,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -421,7 +421,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" timing: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" watcher: dependency: transitive description: @@ -465,4 +465,4 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" diff --git a/starter_testing_project_mobile/pubspec.lock b/starter_testing_project_mobile/pubspec.lock index 473c7ed2..f7378cdb 100644 --- a/starter_testing_project_mobile/pubspec.lock +++ b/starter_testing_project_mobile/pubspec.lock @@ -140,7 +140,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" convert: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" file: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -318,7 +318,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" pedantic: dependency: transitive description: @@ -379,7 +379,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -421,7 +421,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" timing: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" watcher: dependency: transitive description: @@ -465,4 +465,4 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" From fa80b420f68cb88d2636cd68c2163789c751883e Mon Sep 17 00:00:00 2001 From: Dagmawit Getachew Date: Mon, 1 Aug 2022 22:09:59 +0300 Subject: [PATCH 2/8] [Web] Vuex added for retrieving blog posts --- .../{Dagmawit-BlogPost.vue => BlogPost.vue} | 20 ++++++++--- .../pages/dagmawit/index.vue | 13 +++---- starter-project-web-vue2/store/dagmawit.js | 34 +++++++++++++++++++ 3 files changed, 56 insertions(+), 11 deletions(-) rename starter-project-web-vue2/components/dagmawit/{Dagmawit-BlogPost.vue => BlogPost.vue} (54%) diff --git a/starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue b/starter-project-web-vue2/components/dagmawit/BlogPost.vue similarity index 54% rename from starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue rename to starter-project-web-vue2/components/dagmawit/BlogPost.vue index 9ada93cf..5231a327 100644 --- a/starter-project-web-vue2/components/dagmawit/Dagmawit-BlogPost.vue +++ b/starter-project-web-vue2/components/dagmawit/BlogPost.vue @@ -3,7 +3,7 @@ - + {{blogPost.content}} - - + @@ -29,10 +29,20 @@ diff --git a/starter-project-web-vue2/pages/dagmawit/index.vue b/starter-project-web-vue2/pages/dagmawit/index.vue index ced75acd..9fd3bcf1 100644 --- a/starter-project-web-vue2/pages/dagmawit/index.vue +++ b/starter-project-web-vue2/pages/dagmawit/index.vue @@ -1,14 +1,15 @@ + + + From 92098b2fd676ee0946e65fb1cb4ca1e225c8133d Mon Sep 17 00:00:00 2001 From: Dagmawit Getachew Date: Tue, 2 Aug 2022 11:43:56 +0300 Subject: [PATCH 4/8] [Web] Added a single Page UI and functionality --- .../components/dagmawit/BlogPost.vue | 62 ++++++++----------- .../pages/dagmawit/_id.vue | 40 ++++++++++++ 2 files changed, 66 insertions(+), 36 deletions(-) diff --git a/starter-project-web-vue2/components/dagmawit/BlogPost.vue b/starter-project-web-vue2/components/dagmawit/BlogPost.vue index bec74f5b..579f3946 100644 --- a/starter-project-web-vue2/components/dagmawit/BlogPost.vue +++ b/starter-project-web-vue2/components/dagmawit/BlogPost.vue @@ -1,54 +1,44 @@ diff --git a/starter-project-web-vue2/components/dagmawit/BlogPost.vue b/starter-project-web-vue2/components/dagmawit/BlogPost.vue index 9d9d78f8..75b27e85 100644 --- a/starter-project-web-vue2/components/dagmawit/BlogPost.vue +++ b/starter-project-web-vue2/components/dagmawit/BlogPost.vue @@ -1,9 +1,8 @@ - diff --git a/starter-project-web-vue2/pages/dagmawit/_id.vue b/starter-project-web-vue2/pages/dagmawit/_id.vue index ca9e2e7d..44148a89 100644 --- a/starter-project-web-vue2/pages/dagmawit/_id.vue +++ b/starter-project-web-vue2/pages/dagmawit/_id.vue @@ -1,16 +1,16 @@ @@ -21,8 +21,10 @@ import axios from 'axios' export default { data() { return { - blogTitle: '', - blogContent: '', + blog: { + title: '', + content: '', + }, } }, @@ -31,13 +33,13 @@ export default { const response = await axios.get( `https://blog-app-backend.onrender.com/api/articles/${this.$route.params.id}` ) - this.blogTitle = response.data.title - this.blogContent = response.data.content + this.blog = this.response.data } catch (err) { - console.log(err) + this.$nuxt.error({ + statusCode: err.statusCode, + message: err.message, + }) } }, } - - diff --git a/starter-project-web-vue2/pages/dagmawit/index.vue b/starter-project-web-vue2/pages/dagmawit/index.vue index bc0e3aa6..1c8d41a0 100644 --- a/starter-project-web-vue2/pages/dagmawit/index.vue +++ b/starter-project-web-vue2/pages/dagmawit/index.vue @@ -1,21 +1,17 @@ \ No newline at end of file + diff --git a/starter-project-web-vue2/pages/index.vue b/starter-project-web-vue2/pages/index.vue index e823e9ed..49080295 100644 --- a/starter-project-web-vue2/pages/index.vue +++ b/starter-project-web-vue2/pages/index.vue @@ -33,16 +33,14 @@ export default { return { members: [ { - name: "Abraham Tadesse", + name: 'Abraham Tadesse', description: 'Summer Intern', - link: - '/abraham', + link: '/abraham', }, - { - name: "Dagmawit Getachew", + { + name: 'Dagmawit Getachew', description: 'Summer Intern', - link: - '/dagmawit', + link: '/dagmawit', }, ], } diff --git a/starter-project-web-vue2/store/dagmawit.js b/starter-project-web-vue2/store/dagmawit.js index 688377b4..9a09afbe 100644 --- a/starter-project-web-vue2/store/dagmawit.js +++ b/starter-project-web-vue2/store/dagmawit.js @@ -1,34 +1,22 @@ - - -import axios from 'axios'; - const state = { - blogPosts:[] -}; + blogPosts: [], +} const getters = { - allBlogPosts: state => state.blogPosts -}; + allBlogPosts: (state) => state.blogPosts, +} const actions = { - async fetchBlogPosts({commit}){ - const response = await axios.get('https://blog-app-backend.onrender.com/api/articles/all'); - commit('setBlogPosts',response.data); - } -}; + async fetchBlogPosts({ commit }) { + const response = await this.$axios.get('articles/all') + commit('setBlogPosts', response.data) + }, +} const mutations = { - setBlogPosts: (state,blogPosts) => (state.blogPosts=blogPosts) - -}; - -export default{ - state,getters,actions,mutations - -}; - -// Vue.use(Vuex); - -// export default new Vuex.Store({ -// modules:{ -// blogPosts -// } - -// }) + setBlogPosts: (state, blogPosts) => (state.blogPosts = blogPosts), +} + +export default { + state, + getters, + actions, + mutations, +} diff --git a/starter-project-web-vue2/stylelint.config.js b/starter-project-web-vue2/stylelint.config.js index c497a20a..e57a2fad 100644 --- a/starter-project-web-vue2/stylelint.config.js +++ b/starter-project-web-vue2/stylelint.config.js @@ -3,9 +3,9 @@ module.exports = { extends: [ 'stylelint-config-standard', 'stylelint-config-recommended-vue', - 'stylelint-config-prettier' + 'stylelint-config-prettier', ], // add your custom config here // https://stylelint.io/user-guide/configuration - rules: {} + rules: {}, } diff --git a/starter-project-web-vue2/utils/validations.js b/starter-project-web-vue2/utils/validations.js index 64b9e6e0..e01f1137 100644 --- a/starter-project-web-vue2/utils/validations.js +++ b/starter-project-web-vue2/utils/validations.js @@ -1,25 +1,35 @@ -let required = (propertyType, customErrorMessage) => { - return v => v && v.length > 0 || customErrorMessage || `You must input a ${propertyType}` +const required = (propertyType, customErrorMessage) => { + return (v) => + (v && v.length > 0) || + customErrorMessage || + `You must input a ${propertyType}` } -let minLength = (propertyType, minLength) => { - return v => { - if(!v){ return true; } +const minLength = (propertyType, minLength) => { + return (v) => { + if (!v) { + return true + } - return v.length >= minLength || `${propertyType} must be at least ${minLength} characters`; + return ( + v.length >= minLength || + `${propertyType} must be at least ${minLength} characters` + ) } } -let maxLength = (propertyType, maxLength) => { - return v => v && v.length <= maxLength || `${propertyType} must be less than ${maxLength} characters` +const maxLength = (propertyType, maxLength) => { + return (v) => + (v && v.length <= maxLength) || + `${propertyType} must be less than ${maxLength} characters` } -let emailFormat = () => { - let regex = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,24})+$/ - return v => v && regex.test(v) || "Must be a valid email" +const emailFormat = () => { + const regex = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,24})+$/ + return (v) => (v && regex.test(v)) || 'Must be a valid email' } export default { required, minLength, maxLength, - emailFormat -} \ No newline at end of file + emailFormat, +} From 0ede76127c4da41c2ed8a2e321361fce50a3e4e7 Mon Sep 17 00:00:00 2001 From: Dagmawit Getachew Date: Tue, 2 Aug 2022 15:19:02 +0300 Subject: [PATCH 7/8] revert changes --- starter_project_mobile/pubspec.lock | 16 ++++++------- starter_project_mobile_2022/pubspec.lock | 18 +++++++-------- starter_project_mobile_new/pubspec.lock | 23 ++++++++++++------- .../lib/pubspec.lock | 16 ++++++------- starter_testing_project_mobile/pubspec.lock | 16 ++++++------- 5 files changed, 48 insertions(+), 41 deletions(-) diff --git a/starter_project_mobile/pubspec.lock b/starter_project_mobile/pubspec.lock index eaf83836..c8f011d9 100644 --- a/starter_project_mobile/pubspec.lock +++ b/starter_project_mobile/pubspec.lock @@ -147,7 +147,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" convert: dependency: transitive description: @@ -182,7 +182,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" ffi: dependency: transitive description: @@ -311,7 +311,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -353,7 +353,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" path_provider: dependency: transitive description: @@ -477,7 +477,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -519,7 +519,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" timing: dependency: transitive description: @@ -540,7 +540,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" watcher: dependency: transitive description: @@ -577,5 +577,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.0.0" diff --git a/starter_project_mobile_2022/pubspec.lock b/starter_project_mobile_2022/pubspec.lock index 7a7236b0..62f9b250 100644 --- a/starter_project_mobile_2022/pubspec.lock +++ b/starter_project_mobile_2022/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" crypto: dependency: transitive description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" ffi: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" lints: dependency: transitive description: @@ -162,7 +162,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -176,7 +176,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" path_provider: dependency: transitive description: @@ -272,7 +272,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -314,7 +314,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" typed_data: dependency: transitive description: @@ -384,7 +384,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" win32: dependency: transitive description: @@ -400,5 +400,5 @@ packages: source: hosted version: "0.2.0+1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.16.1 <3.0.0" flutter: ">=2.10.0" diff --git a/starter_project_mobile_new/pubspec.lock b/starter_project_mobile_new/pubspec.lock index 779e035b..66c4fb7d 100644 --- a/starter_project_mobile_new/pubspec.lock +++ b/starter_project_mobile_new/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -94,7 +94,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.2" meta: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -120,7 +120,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -155,13 +155,20 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.16.0-80.1.beta <3.0.0" diff --git a/starter_testing_project_mobile/lib/pubspec.lock b/starter_testing_project_mobile/lib/pubspec.lock index 373edbb5..eed8e04b 100644 --- a/starter_testing_project_mobile/lib/pubspec.lock +++ b/starter_testing_project_mobile/lib/pubspec.lock @@ -140,7 +140,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" convert: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" file: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -318,7 +318,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" pedantic: dependency: transitive description: @@ -379,7 +379,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -421,7 +421,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" timing: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" watcher: dependency: transitive description: @@ -465,4 +465,4 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" diff --git a/starter_testing_project_mobile/pubspec.lock b/starter_testing_project_mobile/pubspec.lock index f7378cdb..473c7ed2 100644 --- a/starter_testing_project_mobile/pubspec.lock +++ b/starter_testing_project_mobile/pubspec.lock @@ -140,7 +140,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" convert: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" file: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -318,7 +318,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" pedantic: dependency: transitive description: @@ -379,7 +379,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -421,7 +421,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" timing: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" watcher: dependency: transitive description: @@ -465,4 +465,4 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" From 3ec4a7d89c09986892279bd00f2041bd2eade721 Mon Sep 17 00:00:00 2001 From: Dagmawit Getachew Date: Tue, 2 Aug 2022 15:22:42 +0300 Subject: [PATCH 8/8] [web] revert changes --- .../linux/flutter/generated_plugins.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/starter_project_mobile_new/linux/flutter/generated_plugins.cmake b/starter_project_mobile_new/linux/flutter/generated_plugins.cmake index 2e1de87a..51436ae8 100644 --- a/starter_project_mobile_new/linux/flutter/generated_plugins.cmake +++ b/starter_project_mobile_new/linux/flutter/generated_plugins.cmake @@ -5,9 +5,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) -list(APPEND FLUTTER_FFI_PLUGIN_LIST -) - set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -16,8 +13,3 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin)